Change source format for unicsv write test (timezone problem).

diff --git a/reference/expert-uni.txt b/reference/expert-uni.txt
deleted file mode 100644 (file)
index 84427e8..0000000
--- a/reference/expert-uni.txt
+++ /dev/null
@@ -1,87 +0,0 @@
-No,Latitude,Longitude,Name,Altitude,Description,Notes,Symbol,Date,Time\r
-1,42.438878,-71.119277,"5066",44.6,"5066","5066","Crossing",2001/11/28,22:05:28\r
-2,42.439227,-71.119689,"5067",57.6,"5067","5067","Dot",2001/06/02,05:26:55\r
-3,42.438917,-71.116146,"5096",44.8,"5096","5096","Dot",2001/11/17,00:03:38\r
-4,42.443904,-71.122044,"5142",50.6,"5142","5142","Dot",2001/11/28,22:05:28\r
-5,42.447298,-71.121447,"5156",127.7,"5156","5156","Dot",2001/06/02,05:26:58\r
-6,42.454873,-71.125094,"5224",96.9,"5224","5224","Dot",2001/06/02,05:26:59\r
-7,42.459079,-71.124988,"5229",82.6,"5229","5229","Dot",2001/06/02,05:26:59\r
-8,42.456979,-71.124474,"5237",82.9,"5237","5237","Dot",2001/06/02,05:26:59\r
-9,42.454401,-71.120990,"5254",66.7,"5254","5254","Dot",2001/11/28,22:05:28\r
-10,42.451442,-71.121746,"5258",74.6,"5258","5258","Dot",2001/11/08,00:53:41\r
-11,42.454404,-71.120660,"5264",65.3,"5264","5264","Dot",2001/11/28,22:05:28\r
-12,42.457761,-71.121045,"526708",77.4,"526708","526708","Dot",2001/06/02,05:27:00\r
-13,42.457089,-71.120313,"526750",74.7,"526750","526750","Dot",2001/06/02,05:27:00\r
-14,42.456592,-71.119676,"527614",78.7,"527614","527614","Dot",2001/11/08,00:53:41\r
-15,42.456252,-71.119356,"527631",78.7,"527631","527631","Dot",2001/11/08,00:53:41\r
-16,42.458148,-71.119135,"5278",68.3,"5278","5278","Dot",2001/06/02,05:27:00\r
-17,42.459377,-71.117693,"5289",64.0,"5289","5289","Dot",2001/06/02,05:27:01\r
-18,42.464183,-71.119828,"5374FIRE",53.0,"5374FIRE","5374FIRE","Dot",2001/11/28,22:05:28\r
-19,42.465650,-71.119399,"5376",56.4,"5376","5376","Dot",2001/06/02,05:27:02\r
-20,42.439018,-71.114456,"6006",56.4,"600698","600698","Dot",2001/06/02,05:26:55\r
-21,42.438594,-71.114803,"6006BLUE",46.0,"6006BLUE","6006BLUE","Dot",2001/11/28,22:05:28\r
-22,42.436757,-71.113223,"6014MEADOW",37.6,"6014MEADOW","6014MEADOW","Dot",2001/11/28,22:05:28\r
-23,42.441754,-71.113220,"6029",56.4,"6029","6029","Dot",2001/06/02,05:26:55\r
-24,42.436243,-71.109075,"6053",50.3,"6053","6053","Dot",2001/06/02,05:27:05\r
-25,42.439250,-71.107500,"6066",25.6,"6066","6066","Dot",2001/06/02,05:26:57\r
-26,42.439764,-71.107582,"6067",34.4,"6067","6067","Dot",2001/06/02,05:26:57\r
-27,42.434766,-71.105874,"6071",30.5,"6071","6071","Dot",2001/06/02,05:26:57\r
-28,42.433304,-71.106599,"6073",15.2,"6073","6073","Dot",2001/06/02,05:26:56\r
-29,42.437338,-71.104772,"6084",37.8,"6084","6084","Dot",2001/06/02,05:26:57\r
-30,42.442196,-71.110975,"6130",64.0,"6130","6130","Dot",2001/06/02,05:26:55\r
-31,42.442981,-71.111441,"6131",64.0,"6131","6131","Dot",2001/06/02,05:26:58\r
-32,42.444773,-71.108882,"6153",62.8,"6153","6153","Dot",2001/06/02,05:27:05\r
-33,42.443592,-71.106301,"6171",55.5,"6171","6171","Dot",2001/06/02,05:27:05\r
-34,42.447804,-71.106624,"6176",62.5,"6176","6176","Dot",2001/06/02,05:27:04\r
-35,42.448448,-71.106158,"6177",62.2,"6177","6177","Dot",2001/06/02,05:27:04\r
-36,42.453415,-71.106783,"6272",69.8,"6272","6272","Dot",2001/06/02,05:26:55\r
-37,42.453434,-71.107253,"6272",73.2,"6272","6272","Dot",2001/06/02,05:26:56\r
-38,42.458298,-71.106771,"6278",70.1,"6278","6278","Dot",2001/06/02,05:27:04\r
-39,42.451430,-71.105413,"6280",57.6,"6280","6280","Dot",2001/11/17,00:03:38\r
-40,42.453845,-71.105206,"6283",66.7,"6283","6283","Dot",2001/11/17,00:03:38\r
-41,42.459986,-71.106170,"6289",72.9,"6289","6289","Dot",2001/11/17,00:03:38\r
-42,42.457616,-71.105116,"6297",72.8,"6297","6297","Dot",2001/06/02,05:27:04\r
-43,42.467110,-71.113574,"6328",53.6,"6328","6328","Dot",2001/06/02,05:27:02\r
-44,42.464202,-71.109863,"6354",43.9,"6354","6354","Dot",2001/06/02,05:27:03\r
-45,42.466459,-71.110067,"635722",48.8,"635722","635722","Dot",2001/06/02,05:27:02\r
-46,42.466557,-71.109410,"635783",49.1,"635783","635783","Dot",2001/06/02,05:27:02\r
-47,42.463495,-71.107117,"6373",62.5,"6373","6373","Dot",2001/06/02,05:27:03\r
-48,42.401051,-71.110241,"6634",4.0,"6634","6634","Dot",2001/06/02,05:26:56\r
-49,42.432621,-71.106532,"6979",13.4,"6979","6979","Dot",2001/06/02,05:26:56\r
-50,42.431033,-71.107883,"6997",34.0,"6997","6997","Dot",2001/11/17,00:03:38\r
-51,42.465687,-71.107360,"BEAR HILL",87.8,"BEAR HILL TOWER","Bear Hill Tower","Tall Tower",2001/06/02,05:27:03\r
-52,42.430950,-71.107628,"BELLEVUE",23.5,"BELLEVUE","Bellevue Parking Lot","Parking Area",2001/06/02,02:18:15\r
-53,42.438666,-71.114079,"6016",43.4,"Bike Loop Connector","Bike Loop Connector","Waypoint",2001/11/28,22:05:28\r
-54,42.456469,-71.124651,"5236BRIDGE",89.9,"Bridge","Bridge","Bridge",2001/06/02,05:26:59\r
-55,42.465759,-71.119815,"5376BRIDGE",55.5,"Bridge","Bridge","Bridge",2001/06/02,05:27:01\r
-56,42.442993,-71.105878,"6181CROSS",52.7,"Crossing","Crossing","Crossing",2001/06/02,05:27:05\r
-57,42.435472,-71.109664,"6042CROSS",45.1,"Crossing","Crossing","Crossing",2001/06/02,05:27:05\r
-58,42.458516,-71.103646,"DARKHOLLPO",,"Dark Hollow Pond","Dark Hollow Pond","Fishing Area",,\r
-59,42.443109,-71.112675,"6121DEAD",56.1,"Dead End","Dead End","Danger Area",2001/06/02,05:26:57\r
-60,42.449866,-71.119298,"5179DEAD",117.0,"Dead End","Dead End","Danger Area",2001/06/02,05:26:59\r
-61,42.459629,-71.116524,"5299DEAD",69.5,"Dead End","Dead End","Danger Area",2001/06/02,05:27:01\r
-62,42.465485,-71.119148,"5376DEAD",57.0,"Dead End","Dead End","Danger Area",2001/06/02,05:27:02\r
-63,42.462776,-71.109986,"6353DEAD",46.9,"Dead End","Dead End","Danger Area",2001/06/02,05:27:03\r
-64,42.446793,-71.108784,"6155DEAD",61.3,"Dead End","Dead End","Danger Area",2001/06/02,05:27:04\r
-65,42.451204,-71.126602,"GATE14",110.9,"Gate 14","Gate 14","Truck Stop",2001/06/02,05:26:59\r
-66,42.458499,-71.122078,"GATE16",77.7,"Gate 16","Gate 16","Truck Stop",2001/06/02,05:27:00\r
-67,42.459376,-71.119238,"GATE17",65.8,"Gate 17","Gate 17","Truck Stop",2001/06/02,05:27:01\r
-68,42.466353,-71.119240,"GATE19",57.3,"Gate 19","Gate 19","Truck Stop",2001/06/02,05:27:02\r
-69,42.468655,-71.107697,"GATE21",49.4,"Gate 21","Gate 21","Truck Stop",2001/06/02,05:27:03\r
-70,42.456718,-71.102973,"GATE24",81.1,"Gate 24","Gate 24","Truck Stop",2001/06/02,05:27:03\r
-71,42.430847,-71.107690,"GATE5",21.5,"Gate 5","Gate 5","Truck Stop",2001/11/28,22:05:28\r
-72,42.431240,-71.109236,"GATE6",26.6,"Gate 6","Gate 6","Waypoint",2001/11/08,00:53:41\r
-73,42.439502,-71.106556,"6077LOGS",32.0,"Log Crossing","Log Crossing","Amusement Park",2001/06/02,02:18:16\r
-74,42.449765,-71.122320,"5148NANEPA",119.8,"Nanepashemet Road Crossing","Nanepashemet Road Crossing","Waypoint",2001/11/08,00:53:41\r
-75,42.457388,-71.119845,"5267OBSTAC",73.8,"Obstacle","Obstacle","Amusement Park",2001/06/02,05:27:00\r
-76,42.434980,-71.109942,"PANTHRCAVE",45.3,"Panther Cave","Panther Cave","Tunnel",2001/11/08,00:53:41\r
-77,42.453256,-71.121211,"5252PURPLE",78.0,"Purple Rock Hill","Purple Rock Hill","Summit",2001/11/08,00:53:41\r
-78,42.457734,-71.117481,"5287WATER",68.0,"Reservoir","Reservoir","Swimming Area",2001/06/02,05:27:01\r
-79,42.459278,-71.124574,"5239ROAD",81.1,"Road","Road","Truck Stop",2001/06/02,05:27:00\r
-80,42.458782,-71.118991,"5278ROAD",67.4,"Road","Road","Truck Stop",2001/06/02,05:27:01\r
-81,42.439993,-71.120925,"5058ROAD",53.9,"ROAD CROSSING","Road Crossing","Dot",2001/06/02,02:18:14\r
-82,42.453415,-71.106782,"SHEEPFOLD",69.8,"Sheepfold Parking Lot","Sheepfold Parking Lot","Parking Area",2001/06/02,02:18:13\r
-83,42.455956,-71.107483,"SOAPBOX",64.0,"Soap Box Derby Track","Soap Box Derby Track","Cemetery",2001/06/02,05:27:04\r
-84,42.465913,-71.119328,"5376STREAM",64.5,"Stream Crossing","Stream Crossing","Bridge",2001/11/08,00:53:41\r
-85,42.445359,-71.122845,"5144SUMMIT",61.6,"Summit","Summit","Summit",2001/11/28,22:05:28\r
-86,42.441727,-71.121676,"5150TANK",67.4,"WATER TANK","Water Tank","Museum",2001/06/02,02:18:16\r

diff --git a/reference/garmin_txt-uni.csv b/reference/garmin_txt-uni.csv
new file mode 100644 (file)
index 0000000..1377040
--- /dev/null
+++ b/reference/garmin_txt-uni.csv
@@ -0,0 +1,57 @@
+No,Latitude,Longitude,Name,Altitude,Description,Symbol,Date,Time,URL\r
+1,50.492603,12.105431,"001",,"001","Waypoint",2006/03/28,00:10:37,\r
+2,50.492603,12.105431,"002",,"002","Waypoint",2006/03/28,00:10:37,\r
+3,50.494277,12.105130,"003",,"003","Waypoint",2006/03/28,00:10:37,\r
+4,50.493834,12.106101,"004",,"004","Waypoint",2006/03/28,00:10:37,\r
+5,50.493834,12.106101,"005",,"005","Waypoint",2006/03/28,00:10:37,\r
+6,50.493376,12.107105,"006",,"006","Waypoint",2006/03/28,00:10:37,\r
+7,50.493660,12.107152,"007",,"007","Waypoint",2006/03/28,00:10:37,\r
+8,51.893799,12.977943,"ED_X",,"Dummy airport (Germany)","Airport",2006/03/28,01:38:07,\r
+9,38.631995,-3.174055,"GC_X",,"Dummy airport (Spain)","Airport",2006/03/28,01:42:01,\r
+10,50.493667,12.107150,"Jahnstrasse",,"Jahnstrasse 11","Flag, Red",2006/03/31,21:48:22,\r
+11,46.387606,3.498277,"LF_X",,"Dummy airport (France)","Airport",2006/03/28,01:40:32,\r
+12,50.493834,12.106100,"Liebknechtstrasse",,"Liebknechtstrasse 90","Waypoint",2006/03/31,21:49:30,\r
+13,43.314550,12.161554,"LI_X",,"Dummy airport (Italy)","Heliport",2006/03/28,01:43:25,\r
+14,50.492616,12.105448,"NARVA",391.0,"Start","Flag, Green",2006/03/31,21:49:26,"http://www.narva-light.de"\r
+15,51.312938,12.413165,"RPT015",161.0,"RPT015","Waypoint",2005/05/01,15:02:47,\r
+16,51.312883,12.413248,"RPT016",154.0,"RPT016","Waypoint",2005/05/01,15:03:25,\r
+17,51.312855,12.413248,"RPT017",148.0,"RPT017","Waypoint",2005/05/01,15:03:39,\r
+18,51.312827,12.413304,"RPT018",139.0,"RPT018","Waypoint",2005/05/01,15:04:16,\r
+19,51.312827,12.413276,"RPT019",145.0,"RPT019","Waypoint",2005/05/01,15:05:02,\r
+20,51.312827,12.413304,"RPT020",134.0,"RPT020","Waypoint",2005/05/01,15:05:45,\r
+21,51.312772,12.413332,"RPT021",131.0,"RPT021","Waypoint",2005/05/01,15:06:44,\r
+22,51.312772,12.413332,"RPT022",130.0,"RPT022","Waypoint",2005/05/01,15:07:50,\r
+23,51.312744,12.413332,"RPT023",132.0,"RPT023","Waypoint",2005/05/01,15:08:19,\r
+24,51.312799,12.413304,"RPT024",144.0,"RPT024","Waypoint",2005/05/01,15:11:16,\r
+25,51.312911,12.413443,"RPT025",147.0,"RPT025","Waypoint",2005/05/01,15:12:34,\r
+26,51.312994,12.413804,"RPT026",145.0,"RPT026","Waypoint",2005/05/01,15:13:18,\r
+27,51.313049,12.413804,"RPT027",145.0,"RPT027","Waypoint",2005/05/01,15:13:27,\r
+28,51.313049,12.413832,"RPT028",135.0,"RPT028","Waypoint",2005/05/01,15:13:37,\r
+29,51.313105,12.413832,"RPT029",135.0,"RPT029","Waypoint",2005/05/01,15:13:46,\r
+30,51.313216,12.413887,"RPT030",136.0,"RPT030","Waypoint",2005/05/01,15:14:03,\r
+31,51.313299,12.413971,"RPT031",135.0,"RPT031","Waypoint",2005/05/01,15:14:16,\r
+32,51.313272,12.414054,"RPT032",139.0,"RPT032","Waypoint",2005/05/01,15:14:26,\r
+33,51.313272,12.414110,"RPT033",139.0,"RPT033","Waypoint",2005/05/01,15:14:30,\r
+34,51.313049,12.414610,"RPT034",141.0,"RPT034","Waypoint",2005/05/01,15:15:06,\r
+35,51.312966,12.414832,"RPT035",140.0,"RPT035","Waypoint",2005/05/01,15:15:27,\r
+36,51.312911,12.414943,"RPT036",140.0,"RPT036","Waypoint",2005/05/01,15:15:39,\r
+37,51.312938,12.414971,"RPT037",152.0,"RPT037","Waypoint",2005/05/01,15:25:31,\r
+38,51.312938,12.414971,"RPT038",152.0,"RPT038","Waypoint",2005/05/01,15:25:40,\r
+39,51.312966,12.414943,"RPT039",155.0,"RPT039","Waypoint",2005/05/01,15:29:18,\r
+40,51.313160,12.414582,"RPT040",149.0,"RPT040","Waypoint",2005/05/01,15:30:30,\r
+41,51.313160,12.414554,"RPT041",150.0,"RPT041","Waypoint",2005/05/01,15:30:37,\r
+42,51.313160,12.414443,"RPT042",151.0,"RPT042","Waypoint",2005/05/01,15:30:47,\r
+43,51.313160,12.414387,"RPT043",151.0,"RPT043","Waypoint",2005/05/01,15:30:48,\r
+44,51.313327,12.413915,"RPT044",150.0,"RPT044","Waypoint",2005/05/01,15:30:52,\r
+45,51.313688,12.413332,"RPT045",150.0,"RPT045","Waypoint",2005/05/01,15:30:57,\r
+46,51.313994,12.412860,"RPT046",150.0,"RPT046","Waypoint",2005/05/01,15:31:03,\r
+47,51.314216,12.412498,"RPT047",150.0,"RPT047","Waypoint",2005/05/01,15:31:10,\r
+48,51.314633,12.409554,"RPT048",143.0,"RPT048","Waypoint",2005/05/01,15:32:38,\r
+49,51.314633,12.409499,"RPT049",141.0,"RPT049","Waypoint",2005/05/01,15:32:45,\r
+50,51.314633,12.409499,"RPT050",143.0,"RPT050","Waypoint",2005/05/01,15:33:17,\r
+51,51.314633,12.409443,"RPT051",139.0,"RPT051","Waypoint",2005/05/01,15:33:42,\r
+52,51.314633,12.409360,"RPT052",139.0,"RPT052","Waypoint",2005/05/01,15:33:54,\r
+53,51.314633,12.409360,"RPT053",138.0,"RPT053","Waypoint",2005/05/01,15:34:04,\r
+54,51.314633,12.409360,"RPT054",139.0,"RPT054","Waypoint",2005/05/01,15:34:20,\r
+55,51.314633,12.409360,"RPT055",144.0,"RPT055","Waypoint",2005/05/01,15:35:45,\r
+56,51.314633,12.409360,"RPT056",145.0,"RPT056","Waypoint",2005/05/01,15:35:56,\r

diff --git a/testo b/testo
index ceb82e1619d50272ea417bb32424aecfadb9b4f7..6e4644f27b215f386b143d504d4777b5b72b010a 100755 (executable)
--- a/testo
+++ b/testo
@@ -17,7 +17,7 @@ else
        OD=${OD:-od -Ax -txC -v}
 fi
 
-TMPDIR=/tmp/gpsbabel.$$
+TMPDIR=${GBTEMP:-/tmp}/gpsbabel.$$
 mkdir -p $TMPDIR
 trap "rm -fr $TMPDIR" 0 1 2 3 15
 
@@ -1033,8 +1033,8 @@ echo "lat,lon,descr,name,notes,unk,unk" > ${TMPDIR}/unicsv.txt
 cat ${REFERENCE}/mxf.mxf >> ${TMPDIR}/unicsv.txt
 ${PNAME} -i unicsv -f ${TMPDIR}/unicsv.txt -o gpx -F ${TMPDIR}/unicsv.gpx
 compare ${TMPDIR}/unicsv.gpx ${REFERENCE}/unicsv.gpx
-${PNAME} -i gpx -f ${REFERENCE}/expertgps.gpx -o unicsv -F ${TMPDIR}/expert-uni.txt
-compare ${TMPDIR}/expert-uni.txt ${REFERENCE}/expert-uni.txt
+${PNAME} -i garmin_txt -f ${REFERENCE}/garmin_txt.txt -x transform,wpt=trk -o unicsv -F ${TMPDIR}/garmin_txt-uni.csv
+compare ${TMPDIR}/garmin_txt-uni.csv ${REFERENCE}/garmin_txt-uni.csv
 
 #
 # Basic NMEA tests